Update room version to 2.8.4 #1394

anod · 2025-12-23T13:02:27Z

Fix #1372 Not Compatible with latest android room 2.7.2

Unblock android apps for upgrading Room library

Remove running a query from constructor, there is a check in Room that queries should run always on background thread
Bump gradle and AGP versions to minimum required
Bump min sdk to minimum required version
Fix EventsTest app compilation and run

Copilot

Pull request overview

This PR updates the Android Room library from version 2.4.3 to 2.8.4 to fix compatibility issues with modern Android applications. The main change addresses Room's requirement that database queries must not run on the main thread, particularly in constructors.

Key Changes:

Refactored OfflineRoom constructor to remove PRAGMA queries and implement lazy initialization of page size
Updated build infrastructure: Gradle 7.5 → 8.5, AGP 7.3.1 → 8.2.2, minimum SDK 19 → 23
Simplified native library dependencies by linking maesdk directly via CMake subdirectory

Reviewed changes

Copilot reviewed 14 out of 15 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/OfflineRoom.java	Core fix: moved database queries from constructor to lazy-loaded `initPageSize()` method; improved field encapsulation
lib/android_build/maesdk/build.gradle	Updated Room dependency to 2.8.4 and test dependencies; added Kotlin generation flag
lib/android_build/build.gradle	Bumped Android Gradle Plugin from 7.3.1 to 8.2.2
lib/android_build/tools.gradle	Updated compile/target SDK from 32/31 to 34/34, min SDK from 19 to 23
lib/android_build/gradle/wrapper/gradle-wrapper.properties	Updated Gradle wrapper from 7.5 to 8.5
lib/android_build/gradlew	Updated Gradle wrapper scripts with newer template
lib/android_build/gradlew.bat	Updated Windows Gradle wrapper script
lib/android_build/gradle/wrapper/gradle-wrapper.jar	Binary update for Gradle 8.5 wrapper
tools/build-android-aar.sh	New script for building Android AAR files locally with NDK support
tests/unittests/PalTests.cpp	Added Android-specific path handling for filesystem tests
lib/android_build/app/src/main/cpp/CMakeLists.txt	Changed from importing prebuilt library to building maesdk via subdirectory
lib/android_build/app/src/main/java/com/microsoft/applications/events/maesdktest/MainActivity.java	Removed explicit maesdk library loading (handled by CMake now)
lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/SDKUnitNativeTest.java	Removed explicit maesdk library loading
lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java	Added test for lazy-loaded page size; updated deprecated assertion syntax
lib/android_build/app/build.gradle	Updated test dependencies to match maesdk module

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/OfflineRoom.java

...p/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java

Copilot · 2025-12-23T14:32:48Z

@anod I've opened a new pull request, #1395, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2025-12-29T13:13:08Z

@anod I've opened a new pull request, #1396, to work on those changes. Once the pull request is ready, I'll request review from you.

In addition bump gradle and AGP version

…ons/events/OfflineRoom.java Co-authored-by: Copilot <[email protected]>

* Initial plan * Enhance loadPageSize test to verify valid page size Co-authored-by: anod <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: anod <[email protected]>

… static lock (#1396) * Initial plan * Add thread-safety to initPageSize() using double-checked locking Co-authored-by: anod <[email protected]> * Use static lock object for thread-safety in initPageSize() Co-authored-by: anod <[email protected]> * Add concurrent test for thread-safe page size initialization Co-authored-by: anod <[email protected]> * Use ExecutorService instead of raw threads in concurrent test Co-authored-by: anod <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: anod <[email protected]>

lalitb · 2026-01-15T00:22:38Z

lib/android_build/tools.gradle

    defaultConfig {
-        minSdkVersion    19
-        targetSdkVersion 31
+      minSdk 23


will this affect devices with older and still supported android version ?

Shouldn't, I have updated it to the minimum required by Google
Modern Google libraries require API level 23 or higher, so any real-world app should target at least that level.
Android 4.4 (API level 19) was released in 2013.

In practice, minSdk 28 (Android 9.0) is the realistic minimum today:

Outlook and Intune support Android 10.0 (API level 29) and later.

Teams and Edge support Android 11.0 (API level 30) and later.

lalitb · 2026-01-15T00:30:14Z

lib/android_build/app/src/main/cpp/CMakeLists.txt

-        IMPORTED_LOCATION "${SDK_ROOT}/lib/android_build/maesdk/build/intermediates/cmake/debug/obj/${CMAKE_ANDROID_ARCH_ABI}/libmaesdk.so"
-        IMPORTED_LOCATION_Release "${SDK_ROOT}/lib/android_build/maesdk/build/intermediates/cmake/debug/obj/${CMAKE_ANDROID_ARCH_ABI}/libmaesdk.so")
+#Add maesdk as a dependency
+add_subdirectory(../../../../maesdk/src/main/cpp maesdk)


This will create the maesdk library, is this intended ?

This will build maesdk as part of test app
Currently running test app fails because maesdk library wasn't built when evaluating CmakeLists.
This avoids need to build it separately

anod requested a review from Copilot December 23, 2025 13:02

anod requested a review from a team as a code owner December 23, 2025 13:02

Copilot started reviewing on behalf of anod December 23, 2025 13:02 View session

Copilot AI reviewed Dec 23, 2025

View reviewed changes

Copilot AI mentioned this pull request Dec 23, 2025

Enhance loadPageSize() test to verify valid page size #1395

Merged

anod requested review from ThomsonTan, dimskom and lalitb December 29, 2025 13:12

Copilot AI mentioned this pull request Dec 29, 2025

Fix thread-safety in initPageSize() using double-checked locking with static lock #1396

Merged

anod and others added 8 commits January 14, 2026 13:03

Update room version to 2.8.4

6c7ff23

In addition bump gradle and AGP version

Fix java version

4f8e474

Update lib/android_build/maesdk/src/main/java/com/microsoft/applicati…

9f5263d

…ons/events/OfflineRoom.java Co-authored-by: Copilot <[email protected]>

Enhance loadPageSize() test to verify valid page size (#1395)

7846dd0

* Initial plan * Enhance loadPageSize test to verify valid page size Co-authored-by: anod <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: anod <[email protected]>

Update codeql to run on java 17

a0ab673

Update modules, fix Android build, add test case

90cd97d

Add invalid character test for serializer

6093f00

anod force-pushed the algavris/room-upgrade branch from f416fd5 to 6093f00 Compare January 14, 2026 11:40

lalitb reviewed Jan 15, 2026

View reviewed changes

Merge branch 'main' into algavris/room-upgrade

9200ff7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update room version to 2.8.4 #1394

Update room version to 2.8.4 #1394

Uh oh!

anod commented Dec 23, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Dec 23, 2025

Uh oh!

Copilot AI commented Dec 29, 2025

Uh oh!

lalitb Jan 15, 2026

Uh oh!

anod Jan 18, 2026

Uh oh!

lalitb Jan 15, 2026 •

edited

Loading

Uh oh!

anod Jan 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Update room version to 2.8.4 #1394

Are you sure you want to change the base?

Update room version to 2.8.4 #1394

Uh oh!

Conversation

anod commented Dec 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Dec 23, 2025

Uh oh!

Copilot AI commented Dec 29, 2025

Uh oh!

lalitb Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

anod Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

lalitb Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

anod Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

anod commented Dec 23, 2025 •

edited

Loading

lalitb Jan 15, 2026 •

edited

Loading